* origin/master: (21 commits)
  better source linking, fix missing rel instruction
  bump version to 0.2.4
  bump version to 0.2.3
  workaround #5864
  fix error setupbase.py on windows (#5863)
  bump version to 0.2.2, fix #5861
  also install our config for the kernelspec manager
  install our custom css, update author email and website url, add keywords
  install nbextension, rename entry point for installer, document in readme
  Leif/fix packaging (#5857)
  Fix "kernels" cmd (#5849)
  update version, correct location of version file
  #5726: use pypi instead of github (#5797)
  #5810 Fixed lsmagic output. (#5839)
  #5782 allow setting dpi for png export (#5841)
  #5909 Fixed Magic import with no arg. (#5840)
  jarek/5780: reduce duplication in evaluators  (#5788)
  #5767 add links to jvm-repr doc, improve tablesaw doc (#5835)
  remove "Table Saw"
  #5597 make widgets publishable (#5830)
  ...

# Conflicts:
#	beakerx/js/webpack.config.js
#	beakerx/setup.py

* origin/master:
  polish docs (#5872)
  #5844 - %import with no arguments - fix (#5852)
  Scala interfaces: List to Seq (#5853)
  add e2e tests for plotFeatures notebook (#5856)
  move conda download links to the main page
  #5845: fix grape, add ivy dependency (#5869)
  Revert "#5481 Update to ipywidgets v7 (#5770)" (#5870)
  #5481 Update to ipywidgets v7 (#5770)
  explain install situation betterg
  better source linking, fix missing rel instruction
  bump version to 0.2.4
  bump version to 0.2.3
  workaround #5864
  fix error setupbase.py on windows (#5863)
  bump version to 0.2.2, fix #5861
  also install our config for the kernelspec manager
  install our custom css, update author email and website url, add keywords
  install nbextension, rename entry point for installer, document in readme
  Leif/fix packaging (#5857)
  Fix "kernels" cmd (#5849)

# Conflicts:
#	kernel/base/src/main/java/com/twosigma/beakerx/kernel/commands/MagicCommand.java

* origin/master: (24 commits)
  jarek/groovy autocomplete (#5868)
  add explanation, remove outdated error msg
  remove old text
  #5847 %defaultDatasource crashes SQL kernel fix. (#5851)
  polish docs (#5872)
  #5844 - %import with no arguments - fix (#5852)
  Scala interfaces: List to Seq (#5853)
  add e2e tests for plotFeatures notebook (#5856)
  move conda download links to the main page
  #5845: fix grape, add ivy dependency (#5869)
  Revert "#5481 Update to ipywidgets v7 (#5770)" (#5870)
  #5481 Update to ipywidgets v7 (#5770)
  explain install situation betterg
  better source linking, fix missing rel instruction
  bump version to 0.2.4
  bump version to 0.2.3
  workaround #5864
  fix error setupbase.py on windows (#5863)
  bump version to 0.2.2, fix #5861
  also install our config for the kernelspec manager
  ...

# Conflicts:
#	kernel/base/src/main/java/com/twosigma/beakerx/kernel/commands/MagicCommand.java